Merge branch 'merge-places-sidebar'
authorFederico Mena Quintero <federico@gnome.org>
Tue, 16 Apr 2013 00:29:37 +0000 (19:29 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Tue, 16 Apr 2013 00:29:37 +0000 (19:29 -0500)
This is the new GtkPlacesSidebar widget, which is the sidebar used in
GtkFileChooser to display a list of places/folders that the user may
want to use.  File managers are encouraged to use this widget for
their own global list of folders.


Trivial merge